Autogenerated HTML docs for v1.7.5.1-339-gb602ed
diff --git a/git-config.html b/git-config.html index 61bd574..59c73b2 100644 --- a/git-config.html +++ b/git-config.html
@@ -3302,9 +3302,10 @@ In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the <tt>--patch</tt> mode of - <a href="git-add.html">git-add(1)</a>, <a href="git-reset.html">git-reset(1)</a>, <a href="git-stash.html">git-stash(1)</a> and - <a href="git-checkout.html">git-checkout(1)</a>. Note that this setting is silently - ignored if portable keystroke input is not available. + <a href="git-add.html">git-add(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>, <a href="git-commit.html">git-commit(1)</a>, + <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>. Note that this + setting is silently ignored if portable keystroke input + is not available. </p> </dd> <dt class="hdlist1"> @@ -3412,6 +3413,21 @@ </p> </dd> <dt class="hdlist1"> +merge.ff +</dt> +<dd> +<p> + By default, git does not create an extra merge commit when merging + a commit that is a descendant of the current commit. Instead, the + tip of the current branch is fast-forwarded. When set to <tt>false</tt>, + this variable tells git to create an extra merge commit in such + a case (equivalent to giving the <tt>--no-ff</tt> option from the command + line). When set to <tt>only</tt>, only such fast-forward merges are + allowed (equivalent to giving the <tt>--ff-only</tt> option from the + command line). +</p> +</dd> +<dt class="hdlist1"> merge.log </dt> <dd>
